controlplane/src/core/repositories/FeatureFlagRepository.ts (1)

1488-1494: 📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick win

Declare the explicit return type as Promise<Array<{ id: string; featureFlagId: string | null }> | undefined>. The database column permits null.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@controlplane/src/core/repositories/FeatureFlagRepository.ts` around lines
1488 - 1494, Add an explicit return type annotation to the
getFeatureFlagSchemaVersionsByBaseSchemaVersion method. The return type should
be Promise<Array<{ id: string; featureFlagId: string | null }> | undefined> to
properly account for the fact that the database column permits null values for
the featureFlagId field.

Source: Coding guidelines

controlplane/src/core/bufservices/federated-graph/getFederatedGraphById.ts (1)

76-89: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

Filter out disabled feature flags from featureFlagsInLatestValidComposition.

This loop pushes any flag whose ID appears in ffsInLatestValidComposition, without checking flag.isEnabled. featureFlags includes disabled flags because getFeatureFlagsByFederatedGraph calls getFeatureFlagsByBaseSubgraphIdAndLabelMatchers with excludeDisabled: false.

The sibling handler getFeatureFlagsInLatestCompositionByFederatedGraph.ts filters the same repository result by flag.isEnabled and documents why: a disabled flag's router config is removed without recomposing, so its schema version rows still exist but should not be reported as part of the latest composition. Before this PR's fix, split-config mode likely returned no rows here, so this gap stayed hidden. Now that the fix makes the repository method return real rows under split config, disabled flags can appear in featureFlagsInLatestValidComposition here, inconsistent with the sibling handler.

Apply the same isEnabled check in this loop.

🐛 Proposed fix to exclude disabled flags

       if (ffsInLatestValidComposition) {
         for (const ff of ffsInLatestValidComposition) {
           const flag = featureFlags.find((f) => f.id === ff.featureFlagId);
-          if (flag) {
+          // A disabled feature flag is no longer served in the latest composition (its router config is
+          // removed without recomposing), so exclude it even though its schema version rows still exist.
+          if (flag && flag.isEnabled) {
             featureFlagsInLatestValidComposition.push(flag);
           }
         }
       }

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@controlplane/src/core/bufservices/federated-graph/getFederatedGraphById.ts`
around lines 76 - 89, Update the loop in getFederatedGraphById that builds
featureFlagsInLatestValidComposition to append a matched flag only when it
exists and flag.isEnabled is true. Preserve the existing featureFlags lookup and
skip disabled flags consistently with
getFeatureFlagsInLatestCompositionByFederatedGraph.